From fc10354404123d76910bb7eca4d6bae8d9f58da3 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 22 May 2018 12:14:22 +0100 Subject: [PATCH] lib/repo-pull: Factor out free function for FetchDeltaSuperData This introduces no functional changes, but does make the code a little cleaner. Signed-off-by: Philip Withnall Closes: #1599 Approved by: jlebon --- src/libostree/ostree-repo-pull.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 3ce5cea7..00b161f6 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -2461,6 +2461,16 @@ typedef struct { OstreeCollectionRef *requested_ref; /* (nullable) */ } FetchDeltaSuperData; +static void +fetch_delta_super_data_free (FetchDeltaSuperData *fetch_data) +{ + g_free (fetch_data->from_revision); + g_free (fetch_data->to_revision); + if (fetch_data->requested_ref) + ostree_collection_ref_free (fetch_data->requested_ref); + g_free (fetch_data); +} + static void set_required_deltas_error (GError **error, const char *from_revision, @@ -2541,15 +2551,12 @@ on_superblock_fetched (GObject *src, } out: - g_free (fdata->from_revision); - g_free (fdata->to_revision); - if (fdata->requested_ref) - ostree_collection_ref_free (fdata->requested_ref); - g_free (fdata); g_assert (pull_data->n_outstanding_metadata_fetches > 0); pull_data->n_outstanding_metadata_fetches--; pull_data->n_fetched_metadata++; check_outstanding_requests_handle_error (pull_data, &local_error); + + g_clear_pointer (&fetch_data, fetch_delta_super_data_free); } static gboolean -- 2.30.2